projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0305ffa d6684d8)
bitkeeper revision 1.1159.1.309 (418284a5GxYb-BJtMJAP97pxfWMgww)
authorkaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk>
Fri, 29 Oct 2004 17:57:57 +0000 (17:57 +0000)
committerkaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk>
Fri, 29 Oct 2004 17:57:57 +0000 (17:57 +0000)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/local/scratch/kaf24/xen-balloon-list.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
docs/src/user.tex patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc docs/src/user.tex
Simple merge
Unnamed repository; edit this file 'description' to name the repository.